From 1487b346798889b93d094928cbc9d4033e3c16aa Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Fri, 12 Nov 2010 21:44:48 +0100 Subject: [PATCH] Remove GTK_STATE_LAST. It didn't turn out to be that useful, nor widely used. --- gtk/gtkcssprovider.c | 2 +- gtk/gtkenums.h | 3 +-- gtk/gtkstylecontext.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c index 99776cf475..69594a1414 100644 --- a/gtk/gtkcssprovider.c +++ b/gtk/gtkcssprovider.c @@ -460,7 +460,7 @@ enum ParserScope { */ enum ParserSymbol { /* Scope: pseudo-class */ - SYMBOL_NTH_CHILD = GTK_STATE_LAST, + SYMBOL_NTH_CHILD = GTK_STATE_FOCUSED + 1, SYMBOL_FIRST_CHILD, SYMBOL_LAST_CHILD, SYMBOL_SORTED_CHILD, diff --git a/gtk/gtkenums.h b/gtk/gtkenums.h index cc66e3904c..7393a7a2d1 100644 --- a/gtk/gtkenums.h +++ b/gtk/gtkenums.h @@ -369,8 +369,7 @@ typedef enum GTK_STATE_SELECTED, GTK_STATE_INSENSITIVE, GTK_STATE_INCONSISTENT, - GTK_STATE_FOCUSED, - GTK_STATE_LAST + GTK_STATE_FOCUSED } GtkStateType; /* Style for toolbars */ diff --git a/gtk/gtkstylecontext.c b/gtk/gtkstylecontext.c index 7554322848..e465a1bd87 100644 --- a/gtk/gtkstylecontext.c +++ b/gtk/gtkstylecontext.c @@ -2464,7 +2464,7 @@ gtk_style_context_notify_state_change (GtkStyleContext *context, g_return_if_fail (GTK_IS_STYLE_CONTEXT (context)); g_return_if_fail (GDK_IS_WINDOW (window)); - g_return_if_fail (state < GTK_STATE_LAST); + g_return_if_fail (state > GTK_STATE_NORMAL && state <= GTK_STATE_FOCUSED); priv = context->priv; g_return_if_fail (priv->widget_path != NULL); -- 2.30.2